Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 3 Jun 2010 22:45:12 +0000 (22:45 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 3 Jun 2010 22:45:12 +0000 (22:45 +0000)

Trivial merge